libc: retry open when interrupted#252
Merged
newpavlov merged 1 commit intorust-random:masterfrom Mar 25, 2022
Merged
Conversation
josephlr
requested changes
Mar 14, 2022
Comment on lines
+110
to
+114
| loop { | ||
| let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC); | ||
| if fd < 0 { | ||
| let err = last_os_error(); | ||
| // We should try again if the call was interrupted. | ||
| if err.raw_os_error() != Some(libc::EINTR) { | ||
| return Err(err); | ||
| } | ||
| } else { | ||
| return Ok(fd); | ||
| } |
Member
There was a problem hiding this comment.
I'm wondering if it's more idiomatic to do:
let mut fd;
while { fd = open(...); fd < 0 } {
let err = last_os_error();
// We should try again if open() was interrupted.
if err.raw_os_error() != Some(libc::EINTR) {
return Err(err);
}
}
Ok(fd)
Member
There was a problem hiding this comment.
Alternatively:
loop {
let fd = open(path.as_ptr() as *const _, libc::O_RDONLY | libc::O_CLOEXEC);
if fd >= 0 {
return Ok(fd);
}
let err = las_os_error();
// We should try again if open() was interrupted.
if err.raw_os_error() != Some(libc::EINTR) {
return Err(err);
}
}
Contributor
Author
There was a problem hiding this comment.
I have taken the second version, which received a thumbs up. :)
The open call can be interrupted. Since sys_fill_exact covers this for read operation already, it should be done here as well. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
josephlr
approved these changes
Mar 18, 2022
Member
|
I'll give @newpavlov a little time to take a look, and then I'll merge this. |
newpavlov
approved these changes
Mar 18, 2022
Member
newpavlov
left a comment
newpavlov
left a comment
There was a problem hiding this comment.
I wonder if it could be worth to limit number of retries to be extra safe by replacing loop { .. } with something like this:
for _ in 0..256 {
// ..
}
Err(Error::TOO_MANY_ITERATIONS) // find a better name
Member
It looks like Rust's |
henrysun007
pushed a commit
to mesatee/getrandom
that referenced
this pull request
Nov 24, 2022
The open call can be interrupted. Since sys_fill_exact covers this for read operation already, it should be done here as well. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
takumi-earth
pushed a commit
to earthlings-dev/getrandom
that referenced
this pull request
Jan 27, 2026
The open call can be interrupted. Since sys_fill_exact covers this for read operation already, it should be done here as well. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The open call can be interrupted. Since sys_fill_exact covers this for
read operation already, it should be done here as well.
Signed-off-by: Tobias Stoeckmann tobias@stoeckmann.org
Shoutout to c3h2-ctf.